Removed OnLoadingCommand and alphabetical order