New aditions and temporary fixes

Change-Id: I6118854e76717a0ee25afd8adc285d58f219c866