Move More Hard Coded Stuff to configurations