Improved entity fields access behaviour