Added more foundations support