Added more properties, uniform behavior