Configuration support added