Moving static const to readonly properties