Enforcing simplified JCF style, additional data structures added.