More work on options table