Added initial support for identification