Added Baker framework