HTML-523 Changed to using OpenmrsComponent