Refactored ContactListener, improved performance and included wallList