Refactoring to support bin installation