Work on the internal handling for the custom blocks