Changed controller interface