Add overridability to some blocks