Updated to use const values instead of hardcoded values