Fix: No hard coded data