Removed TODOs and added getters for name property