Moved initialisation of HashMap to Constructor