Changed extension for logic separation