Removed EStore usage and finally fixed opposite loading