Add configurators. Fix bugs