Improve constants and class abstractions