Custom indicator factory & bug fixing