Switched to using Spring