Connect class
Fixed save