Added package management and math