Added new features to App