updated maps and rest structure,
fixed delete support.