Added assembly support