Added command line builder, fixed requires