Fixed MVP demo (allowing multiple inserts) and dependency problems