Changed name to UniversalApp