Adding Figure class