Added remap API, more comments