Added can_skip option