Non-functional changes