Remove static keyword for backward compatibility