Added controller interface, fixed missing imports