Begin add support for 3rd party apps