Updated to add position support