Minor changes for user-template