changed model for future db implementation