New API wrapper coming soon
Separated class for facets
classes rearranged
small facets fix