Changes for standalone gender check