Updated the ids and added base classes for stone