Added s4 directory to make functions S4 compliant