Implemented more badges