Little improvements, defining architeture