Added more customization and refresh work