Performance improvements (closes #547)