Added extension Handling