Improve layer interface