Ready for database integration