Added constants and new class