Updated with generated files
UNMAP support