Remove emerald from the bundle from now till it reaches stable state
Add useful default values for AttributeDefintions