Added support for more app properties