Drop use concrete collection option
Replace free marker templates by java class based templates