Improve customizability

Related to #766