Cleanup
Moved forward-compatible option in the package
Fixed regexp
Schema adjustment