Added strong typying