[Gsoc-mentors-2019] General improvements