Add more database retrieval