Add credential support
Switch to simple handler