Minor changes for mapping boolean field