More improvments.
Adding all the dependencies to the facetapi.