Add entry mapping structs