Refactored some methods in IoCContainer, updated todo list