Added Storage class and updated builds