Added options framework