Added extension feature