Don't use common objects anywhere

Don't use common objects anywhere