Minor changes - added @deprecated etc