Defined constants, edited Database class