Moved some constrains to config