Added better support for constants and static properties