Add gender as booleans, replaced hard coded values