Updated to now implement interface 1.0.0.1