added support for messessage and pin validitity support