added cheetah/spitfire syntax support