Manually adding code to get optionals from new place.