Converted to use generic object functions