Change usage of Spot and replace with Doctrine
Merge Doctrine branch