Simplify configuration
Add more facets