Added objects file, generic object functions and renamed methods