Reorgansiation, added additional helpers