added PolyAuth and also billing schema