Reduced an extra database call