I will try it out locally and if it's working fine, I will make the changes, so that it can be merged!