Added extension checks