MODELING STORAGE TECHNOLOGIES IN CAPACITY EXPANSION MODELS