Committed plugin and new suggested base entity
Cleaned up the plugin