Add properties and adjusted methods