Added missing virtual keywords and some data annotations.