Replaced one entity on 0.1 level with the new entity
and some minor changes