Type safety

Last updated