Completed conversion to derived
types