Replace self with static