Updated Custom config and bump to v2.1