Changed Either and Option api