Removed usage of interfaces