Updated definition to support foundation 5