Updated tile builder