Added field & message options support