Added support for more properties