Add necessary dependencies + Bugfix