Edit block constructors to use config singleton