Refactor dependencies
Release 0.0.7