Several enhancements for support of the JSC style