added TypeSafe resolver