Added controller methods and spec