Add support for app splitting