Updated to entity 1.4