Added support for both oid and mace based attributes
Added some addition config parameters