Alignment

Updated the classes here to conform to the changes made in the server
and framework.