Switched to storing info in Application