Move facets to separate model