Some functionality changes
Spec changes