Extended Server.java functionality