Added flexibility in patterns to avoid fails