#10 Replace DS annotation with Felix SCR annotations