WIP : enhance processing of inner clases for issues #18 and #15