Added switch element and mac generator