Merge branch 'paulmaxwell/storage-bundle'
Fixed annotations in entities