Removed immediate true from fields. Added where necessary. Performance
improvements to EntityContainer