Code

Added backward compatibility