Move interface implements to concrete class