Ensure Datasource handles are accurate by using the Lang class rather than just General
Fix the prepareGateway class being called in a static context. RE: #17