Added commons setup, 1st try