Updates for better use with multiple instances and some updates on the example1