Added constant token
Simplified interface by removing un-needed method