added support for NamingStrategy parameter