Added required Unit return types