External server support added