Updated for properties supported for issue #4