Improved Structure according to developer.apple.com & additions