Moved enum from implementation to interface