Added Time Machine support