Added more derived attributes.