Move magic numbers into Config params please