Added internalization