Added typing