Improvements to implementation. Spec support.