Issue #13 - Add core model