groups logic for Column annotation for class and for Source annotation

Issue #507