Added some indirection to support passport framework