Application templates improvements