Added implicit extension support