Started moving interface to its own class