Refactor and update dependencies
0.0.6