Added in Config screen
Also changed model into a global application