Initial spring integration implementation
Bugfix