Implemented support for property pages. Fixes #592