Included a few more features

Change-Id: I0d91d0c62b4100d91d99f54ae1879b32457090fe