Some tile related classes refactored