Improvement on implemented methods.