Various additions to basic setup