Removed Interfaces and updated accordingly.