Added complex join todo marker