Adding repeat and advanced options