Improved entry functionality