Constants moved to a separate file