Added startup hooks