added support for 'server_state' grant_type
added import methods