Added servlet functionality