Moved client helper classes