Adding capabilities and optimising structure