Add Ability to support circuits

Add Ability to support circuits