[DF-616] complete add switch entity functionality, integrate with mime helper