Changes for: App porting to Production