Added automatic setup