Added some P::Critic compliance