07.26.13 added new dependencies and class structure