Updated custom component