#40 Added a bit more type safety to properties