Added automatic building