Issue: #63

  * Added load for all appropriate classes