Add constants and account store