Smart Grid and Energy Storage Integration