Tidied up DataConnection class, fixed AddMethod
Conflict fixes