Fixed namespacing to allow for class specification I previously removed