Add unit filtering based on services
Add support for importing single entities