Added enhancement switches