Updated BasicToken to support an Object as value instead of String. and
added javadocs