Removed hardcoded data