added support for j2.5 style