Added logging, moved scene mapping