Improvements on App to comply with latest introspect framework