Converted module to use generic object functions