Adding storage and cleaning up features