Changed methods to use generic object functions