Removed hardcoding