Bug fixed
Improved own ArrayList and HashMap