Modifications to the foundation framework