Made build easier