[WIP] Remove Taxonomy entity and add it as dependency