Angular directives enhancements

Change-Id: Ia6a85822bb67c82107dc9a6d1d4d365d77318118