Added and updated javadoc of Controller