Start to move options to database table