reorganized specs
add persist option for models, enable lambda options again