Added rudimentary angular support