added support for prefixed properties