Added more constants, moved some methods