Change dev dependencies to normal dependencies
Fix callback logic