Improve variation form pattern and data