Added in definitions for lists and maps