Load Issues Fixed

Load Issues have been fixed, wich incluedes app crashing due to overflow
of static MAP.