Added extension support. ( almost )