Updates to tenant API and moving of formatting functions to be members of their appropriate class