Changed some constraint to allow latest versions