*Entity declarations need <?> to avoid compiler warnings - I will fix during merge.