Implemented proper Token