Added support for simple building functionality