updated the add handler macro with additional unitities.