fixes: linked properties and lazy adapter loading