Improving controller template