Change methods for in-skill/application control instead of hard-coded