Separate file for compatibility