Added Director related items as well as updated insert/edit