Added bufffer & socket classes