Add s-iterator jsp and more