Added util, annotations and extensions