Added touch logic and logging support