Update async support
Add server.properties
Merged