Added core entities