Changes to prevent dependecies conflict.