Feature/handle options