Add functionality

Change-Id: I97a2efc9a785bcfe4da967c1c4e1dd8bda5b9e73