added backward compatibility for keywords