Core

Add core entities