Major revision to include aliases etc