Implemented Bottle, BottleType Services

Also added convertor for Toxicity Entity
needed for Bottle Service