Add more code to handle either Backbone or Exoskeleton
Fix consistency in code