Adding TypeSafe