Added initial server listener support