Added Type annotations