Added auto fetch Points in Zone
Improved tests.
Improved repositories, model and tests