Removed old methods and implemented new Interfaces.