Updated models to support plugin data
Fixed bug in ORM models, and registration