Fixes and new aditions

Change-Id: I44c5f5d1bde47ef01851da2edd594029e8c4b7fd
Fixes and new aditions

Change-Id: I6cf89115fd3ed6924bb30a44e81745febee60869