Moved annotations into dedicated module