Add Controllers and Entities