Decouple generation of model specs from registering model specs. Some method renames
Fix bug in model spce generation, root spec was not been included in returned list of complex specs