Adding sabre less structure