Minor additions basic setup