Improve some property stuff