Move id definition to Commands.js