Move Options inclusion in agent