Entity Form code moved to SimpleItemRetrieval dal layer