Added support for ASM spec v0.6.1