Adding tile names to definition, other stuffs