Updated loader to deal with boolean data