Updated with latest gems and for shibboleth :metal: