Svet: Fixed errors for new Entities