Improved shape definition
Added dexy docs