Updated specs to match new model structure
Added support for function-free virtuals
Closes #37
Closes #36