Updated WindowDescription to be a bit more feature complete