added support for 1.2 spec