Issue 31/32 : Split BOMState to ensure Manipulators can be activated independently. Add NONE to propertyInjection. Add tests and code cleanup