Issue #14 [BuildQueue] - reorganized based on method types