Updated to handle account levels