Cleaned up property manager