Add support to nested options