Part of next steps for project modernization after #101.
Part of next steps for project modernization after #101.