Refactored model.list and updated cli staff file to use it.
Dropped DataMap lib as its no longer used