Remove chunks from Factory creation, used HashMap for this. Improve performance. Adjust Field name constants.