Added startup functionality