Added more syntactical sugar