add support for current_user