Added some more changes for devslavei