Added constants and modified networking classes