Added rspecs + Backward compatibility added