Feature entities fixes