Some structural and spies changes