Updated property system to better handle platform specific components