Design implementation + optimisations