Added some changes to implemetation of Bridge pattern