Added arrows and targets tables support