Removing requirement for $args in Storage