Slightly updated Options Framework