Add PropertyStream for server state introspection
Fix order of includes