Begin add support for apps