Less hardcoding