Minor spec changes
Handle callbasks