removed core hack and moved constants to helper