Added support to colision map hold more than one entites at a time. Also
improved model to decrease dependencies.