Refactor names and add rest objects