Now supports creating entities