First implementation of new lens data functionality + some minor fixes