Added config options
Added service references