STORAGEMODEL-275 fixing ImportError in previous commit
STORAGEMODEL-275 fixing SyntaxError in previous commit