Modified to use converter class