Added _active to schema
Added _active handling
Merge branch 'no_delete'