Logic from base moved here
Adds branch aliasing