Moved internal server methods to new location