Upgraded Entity module to 1.5