Added model spec and new style