Make refatoring of all methods that creates entities. Update starte.