Updated Spec and Storage to reflect alex changes