Adding MVC for 'stream' and 'unit', migrating to DB