Extended achievements architecture

Also added some new listeners