Added initial code for storage spot support.