Added MOCKABLE attribute to be used in unit tests