Added servo support