Added support for more stone types