Removing dependency of Compound in the server