Added token support #13