Added several gems still need to implement