Added Foundation support