Made the types more permissible