Added generic s3 methods to critpat and updated s4