Fixed package requirements and implemented current best practices