Added internal controller