Removed all Extension annotations, for running demo