#696 Support for pills and labels