changed commit model over to enhanced type, updated usages