Added default mapping