added support for vector organisms