Few updates

Updated design model
Spell refactor on package