Class restructured to avoid conflicts