Added custom graph + package cleanup