Slightly extended tile def into and tile factory