Reduced dependencies (a bit)