Option checking moved to userland library