Less hardcoded dimensions