Added built-in server support