Added feature for custom views