Update module to use generic object functions