As Amitaibu suggested here using Entity API would ease the life of the developers working both on and with this module. But I guess it would be a major rewrite.