Fixing concrete class to match interface