Updates to add way/generators