More built-in storage

More built in storage