Added model package and enums