Refactoring, added implementation of interfaces