Moved to using Reactor model