Moved functionality into dedicated controller