Added extension support