Adding package builder stuff