Add system fields and basic Helper/Model