added Type (#8)