Replaced Handler with static making making it compatible with overwritten classes