Made more things configurable by cpu