Static removed from Constants