Improve substances mangament