Updated to the new API
Bugs are to be expected
added Dependency