added some Column and Table annotations