Implemented required TODOs