Added BuyHandler and updated classes