Added support to annotates, extras and aggregates