Added boilerplate storage, minor bugfix