Added Current struct