Updated usage and build function