Resolve namespace issue
Add evaluation of modes