Refactored to new space module
Updated dependency versions
Tagging version v1.2.0.M2