Added util and annotations