Improvements: Connection and schema support - POC