added annotations for table and column