Changed type, added working extension code