Feature/allow option adding