Moved variable setting to a custom command.