Made OO and escaped strings