Improved retina support and logic