Added new objects, renamed methods