Added Type definitions