Added basic support for application