Added Dictionary models
Rewrote Stong code