Added configurable fields options and storage