Modification according to the latest changed in bladenightapp-common