Add temporary logic needed to build