Added initial extended support for shot suggestion system