Add constants and better names