Added more internal compiled variables