Add part of setup implementation