Added: Some small changes to store entities