Added axis dimension option, and clipping support