Updated, debugged and enhanced the extension

Change-Id: I9941e63c18d6e1d7fe3a158b983e1f9cf0802f8b