Make options nullable
use helper methods