Trying to handle constants better