Initial commit for properties types improvements