support expiry API
support account details API
refactor of some code