Full implementation of 1.0.0