Adding direction
Adding origin support